bitkeeper revision 1.1358 (4267e561Ml7gO0DQYGp9EYRUYPBDHA)
authormaf46@burn.cl.cam.ac.uk <maf46@burn.cl.cam.ac.uk>
Thu, 21 Apr 2005 17:39:45 +0000 (17:39 +0000)
committermaf46@burn.cl.cam.ac.uk <maf46@burn.cl.cam.ac.uk>
Thu, 21 Apr 2005 17:39:45 +0000 (17:39 +0000)
commitfa3bf1db526499af45287d1382bdfc235767e0a5
tree90ac0f58d8aec11e317627755c8915ce71aaa8e7
parentc184a240a5cfb5fc46214542a4424efd05fce745
parent799b3519ae491013bc2e9e4bc0dcbf350797061a
bitkeeper revision 1.1358 (4267e561Ml7gO0DQYGp9EYRUYPBDHA)

Merge burn.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into burn.cl.cam.ac.uk:/local/scratch-1/maf46/xen-unstable.bk

Signed-off-by: michael.fetterman@cl.cam.ac.uk
xen/arch/x86/domain.c
xen/arch/x86/vmx.c